projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5ccb74 6c30313)
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (19:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:26 +0000 (19:22 -0800)
commit8d99e233147d44c2176cef599db754d06b12f5e3
tree1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6tree | snapshot
parentd5ccb74848658d20a7b31ea3a2bf5a090468fd5dcommit | diff
parent6c3031399b796feceaab2bdfe94abe7170db4e34commit | diff
Merge from origin/emacs-26

6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
admin/gitmerge.el diff1 | diff2 | blob | history
lisp/org/org-clock.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.